Some fix before 3.3 and front user