small changes to accommodate internal API changes. Turn version back to non-snapshot