Fixed some minor issues
More minor fixes