Many small changes to get it to compile