fixed compile errors in last push