Fixes from Mark