Update BWL to latest SPNL changes