Bugfix moduleclasses v1.6

as title says; I worked on the ones mentioned at http://pastebin.com/pb3kEUTw
others (like cairo) which also need a fix, let's do tomorrow 
(can spend a bit of time on getting this right, I know I am a nitpicker but I pay the bill for it)