Fixes after commander update