Fixing minor bugs.

The debugging left some traces that shouldn't have been commited.