Fixed up a few minor issues