Minor tweaks
Merge pull request #1346 from ghost1227/bugs/1285

Bugs/1285