JS warnings cleanup