2.8.1 First Aid patches