Russell/bttf quickfixes