More upcaster fixes