[sr-dev] git:master:d2d90af5: Fixing problems