Fixed compile errors after merge