Corrected some FixMes