fixed compile errors after last merge