Fixed Problems
Minor fixes