Specifying more types on other modules

I even found a Doppio bug. :-)