A few more fixes for 18Neb.