Fixed some minor issues