Minor behavioral cor and command fixes