fixes from master