Fixes for when to load up data