SI-6502 Addresses comments by @som-snytt