[Misc] Fix compilation issues with g++