Fixed bugs in user testing pre 1.6.0.2 release