Fix last of the known button loading issues