A few fixes to recent changes