Some small tweaks, not enough to solve the compilation problem though :-(