Fixes from Joe