Fixes from brit