Important fixes.