Fixing some minor compilation errors during make check