version pinning and fixes