Lot of small fixes.