[PATCH 0/7] bugfixes from DISA FSO