Final fixes to restore functionality to previous levels.