Added some more temporary fixes