bringing across fixes