Few more debug fixes