Fixes to work with moar data