Fixed some inconsistencies with _prepareData.