Bug Fixes

Summary:
Fixes T1232
Fixes T1233
Fixes T1234

Test Plan: * compare changes to bug task to see if fixed

Reviewers: rjmackay, shadowhand

Reviewed By: shadowhand

Subscribers: brandonrosage

Maniphest Tasks: T1232, T1233, T1234

Differential Revision: https://phabricator.ushahidi.com/D566