Fix instanceofs