HLAWP fixes