Two minor compilation fixes for g++/ubuntu