Fix remaining things