small fixes for debug