Tried to fix some warnings.