Minor updates to support functionality

This should solve the network on main thread exceptions you were experiencing.