various changes in preparation for dynamic linking support