Fixes to assumptions about required data