Small fixes in the new version