Fixes for previous updates.