Fixes some issues caused by the merge with master.