Fix problems with removed generic module