Three small fixes