fixes for constant commands