Fixes for local data quirks