Minor changes to extras processing.