various fixes while making the fs storage a bit more robust and safe