Few smallish fixes.