Fixed a couple of issues on the previous merge