Fw changes, mostly