E1S2: fixed a few oversights