Fixing js errors see 1d68db47b2dcb00a36e5b2d90e5be3cd6494cd56