Fix remaining problems