fixes for js