#Tool#Javascript - Bug fixes