various tweaks towards compilation
more tweaks towards compilation