Version improvements