Fixed some more JS