PUP-1244 - minor fixes I forgot to commit