Fix nitpics for http://goo.gl/jmDO3K