Fix nitpicks for http://goo.gl/3IbXkd