More Stoch Bugs fixeds