more fixes for next release candidate