Fixes for data logger.