Fixes for bunk data fields