Fixes for loading up data and labels being wonky