DISA fix, makefile fix (bug #3049)