Fixes

Will need to implement the exploit fix properly in 2.5.1. (whoops!)