Fixes from lab help