PUPPET-133 Minor things