More lab gen fixing