minor debug improvements