Fixes for the broken recodes.