A few minor fixes and remove logging.