additional fixes from andy comments