Minor cleanup to remove warnings