Fixed cop issues