GBP: L3 out fixes