Fixes bugs for integration with policy module