Added js fixes