a few final fixes from Stefan