Fixed compile errors introduced during the merge