fwr: fixes following sanity