Fixed a few more minor issues