minor changes to fix GCC compiler issues