Small fixes
New version