fixes from lab