Three fixes on request from stof