Last set of small fixes.