Some other fixes in the new version