jaxon fixes