Javascript Init fixes