Some data tweaks