fixes from paul email