Tweaking a few things before the data push