Many small fixes.