Multiple small fixes.