ApiCop improvements