Fixing a couple minor issues caused by the recent merge