Temporary fixes to make it work