fixes related to mainstream changes