Debug statements, NS fix