Ensure that singleton objects are returned from connection and screens