Some small updates to make compile/linking a little saner