fixes to no data problems