Fixed embarrassing omissions for handling the new buttons.