Changed some minor issues