3 small fixes