Fixed incompatible commands