Fixed compile errors caused by merging with master