[QE-1108] Minor improvements