Fixed issues breaking compile on GCC