Scrutinizer JS fixes