Fixed two build problems

One compilation problem caused by my last patch, the other one was already there.

It seems my .cmx patch does the right thing btw.  I have tested it on one of my packages.  I hope it will work with all the others.