Fixed compile errors after rebase