fixes after integration with ZMP portal