Minor changes to get better GCC compatibility with warnings