Minor doc update and bug fix.