Make the build work again with V3
some minor cleanup