Quick fixes for g++/linux compile