Little fixes for js