Removed two warnings