Minor bug fixes, adapted to new libfizmo.