Fixed bugs for the release