various fixes on policy