Make extra buttons more robust