Tooling and deps upgrade, fix for #1