Fixed a couple bugs
Merge branch 'develop'