Lab fixes