Fix some UNITE commands