deps fixes, unlock fixes