Minor fixes related to new exp/imp buttons