Tweaks for null data coming back