Update version, minor fixes