Fixes from initial testing