a couple more back ports that may be needed