Add missing utilities, bugfix upgrade to Formwork