Fixes and update version