Minor build updates

A couple things that make integrating Simpl3r as a library easier.