More debug statements

@swissmanu: merge?