Fixing last errors