Ghetto fixes