Cleanup to clear five compiler warnings.