Fix generics in XDController