- merge fixes from head