Policies bug fixing