fixed includes
fixed JS warnings