Initial fixes to get it running