Some extra changes to fix a couple of minor issues