Added code to remove warnings.