Fixed issue: Minor fixes