Fixed a few minor merge issues on the last commit