Attempt to remove warnings