small fixes from dev

small fixes from dev