minor changes to help compilation