Other small fixes