Fixes issues caused by the merge with master.