Fixes for HLA support