fixup! Local data types