fixed: some minor changes after merged pull request: [develop-zatebou] -> [develop-s2]