Compile fixes for gcc 4.6