removed two warnings