Ghetto fixes

What do you think?