more fixes to be squashed.