Use correct type in callbacks