[Fix populator]

- minor fixes