Correct the type checks
Fix constructor check