some additional fixes