Fix some stuff that gcc didn't like (now closer to adhering to C++ standard)