Bunch of temporary fixes