Fix build and versions (again)