Other fixes from JD