Other small fixes.