Changes to the specification builders and fixups