(TK-96) Cosmetic fixes based on PR feedback