minor debug/warn improvements