Minor build improvements

Two minor build fixes/improvements which together enable r3-core-linux to be built with and statically linked against the musl C library.