fixes for Fishgram and Situation Generator