Other small fixes...