LUSTRE fixes in 2.1