applied fs_ patches