Fix the debug directory.

6a2eb54092fc625d59921a607ff68cd1a90aa898 and
71f18e8a066a01dda0c8e5508b135ef104e43e4c required
some changes that weren't applied in debug.
5 files changed