Failover version: normal functionality

Fix bugs introduced over normal operation of controller