Small changes + count operator build in