Fix Policy bugs