Fix type specs
Fix callback specs