fixes for standalone builds
7 files changed