ComputeController state updates, last time fixes