Bug 990635 - Fix misc issues and nits, r=gaye