more duty fixes