Code corrections to avoid the warning messages.