Fixing several small issues before the release