Fixed a few minor issues