Updates for new lme4 compatibility