SI-6502 Addresses @som-snytt's feedback