minor changes after the meeting, which removes warnings