Stupid fixes