Stupid, stupid, stipid fixes