Dealt with some compiler warnings.