Re #162: Hot fixes.