Small fixes to get it running