Some fixes for Borja