fixes for Spanish cv and margins