Eliminated some warnings.