fixups to be squashed