Last small fixes.