Fixed a couple minor issues