More DNA fixes.
Merge remote-tracking branch 'zomgponies/master'