Addressed some warnings.