Obvious fixes (late at night)