Some control btn related fixes