RFD 113: minor updates
RFD 113: minor updates

davepacheco/rfd,melloc/rfd,melloc/rfd,davepacheco/rfd,melloc/rfd,joyent/rfd,davepacheco/rfd,joyent/rfd,davepacheco/rfd,davepacheco/rfd,joyent/rfd,joyent/rfd