Data passing problem fixes