Rena's fixes =]