Fixed
Minor fixes