Fast fixes for g++