Some fixup code that may or may not be useful in the future