[PATCH 0/2] [bugfixes] addressing FSO feedback