* some corrections to build system.