Compile fixes for 1.7.10