small fixes for the JAWS version