Fixed policy bugs.