Various fixes
Merge branch 'development' of https://github.com/WellCommerce/WellCommerce into development