Stupid changes just to get things to work...