Couple little changes to get the generated code to actually compile..