HCSVLAB-362: Added cosmetic fixes.