Fixed data juggling issues