more magic button fixes