Bug fixes, especially one to DAA