Fix some merge bugs and a refactor mistake
Clear out some hotfixes from the servers staging.