Compile fixes for 4.8