fixes to get it running