Two small amendments to #1582: replacing bit of deprecated code, fixing typo.

Pinging @rixbeck :-)