Some changes from code analysis
Array and string fluent comparison