Compile fixes for last merge