Fixing some controller<->connectivity issues