Updates to latest bluk-base