Fixing some last errors