Correct some button miss-behaviors experienced