Fixed a few teething bugs stopping me from doing active data provider