Fix Closure compiler reported errors