Updates to comply with GJSLint