Fix minor issues due to merge