HLAWP fixes and R&B changes