minor changes to help compilation
renamed to see if that's the parse problem