More modbutton/saved sub fixes