some fixes before the release