Merge pull request #214 from dimagi/fix-develop

Fix bugs on develop branch