Minor cleanup to eliminate warnings