Minor comments/fixes