Bug fixes and improved compatibility with Defeat + DA