Continued fixes for JSHint