Fix typeof issues.