Fixed up some things to get rid of jshint issues.