Last fixes before the release