fixing policheck issues