Various manual updates.