PIM-3144: Minor fixes