Fixed a minor issues