Some fixes

I couldn't get sta to build on Linux due to a missing `#include`. While fixing that, I decided to do some more plumbing.