Some more fixes to get it running