release candidate some fixes