Fixing 2.5 issues, updating instructions minimally