Functinal fixes for Policies