Bug fixes in model policies