Some POMs rationalization and few other minor things.