Fix missing type
Fix unreachable code