General small fixes