small fixes from g