Fix for old deps
Cleanup
Various fixes