Series of small fixes.