fixes for new rubo cops