Small fixes (Release commit)