Some fixes for Jesper.