Fixup old thoughts