More minor Benja tweaks.