Bring in latest slim changes