Minor changes to work with GCC standard