Couple more fixes to please Travis, but now I ran jshint locally first.