Tried to make CA a bit happier.