Various bug fixes for DINAA edits