Fix building of correct modules