Little changes to get it to compile