- Other small fixes