more changes to get buildkit working