Cleaned up some minor issues