Fixes
Minor bugs
Merge branch 'develop'