Resolved some warnings.