Few small fixes.