Few more fixes. Update version