Minor updates for clang build and when no STATIC_LIBS set