Fix cop issues