Fixed invalid type references