Fix some buttons again