Added fixes from tngweb and the PM update

Added fixes from tngweb and the PM update