add additional fixes