Resolve CA warnings