Fixed reconfiguration bugs!