Fixed minor bugs

Bugs related to spacing issue.