[QAE1037] Some fixes