Review Requests: SAMZA-115 and SAMZA-120

[Chris Riccomini]

Hey Guys,

Relatively minor tweaks. Could someone have a look? :)

Cheers,
Chris