Last testing phase fixes