Update version info, fix errors