2/12 HLAWP fixes