DNA pre-release 2.5 BUG FIXES