Fix verbose logging & correct type