more server-versions fixes