Minor changes/cleanup to match latest Context