Important fixes