Deploy #318 fix to production

Deploys #318, #319 to production.