compile fixes for last merge