Fixes for previous commit. Parameters into js