LUSGS fixes