A few fixes after the last two changes