datafixtures, bug fixes