Minor warn/debug fixes