Policies tweaks 2