Issues found on testing

https://jira.corp.inmobi.com/browse/DBUS-209
https://jira.corp.inmobi.com/browse/DBUS-210
https://jira.corp.inmobi.com/browse/DBUS-211
https://jira.corp.inmobi.com/browse/DBUS-212