Small fixes on ordering operations of some controllers