Fixed numerous issues with policy construction