Various fixes before the release