fixup initialization issues