POMs' tuning ;)

Change-Id: I820c66917fc00087827579e559ce78da94540b4f