Start working on fixing things after the last merge