Fixes compile errors introduced by last merge