Fixed Few things
Merge pull request #307 from projectcs13/sp9.sc2.issuefixes

Fixed Few things