Fixing several issues identified in the Madrid meeting