LAI-5 fixes for build