Minor cleanup to get rid of annoying warning