build-stacks-fixes