Improvement of Catena-DBG and Makefile fixes