Build fixes for linux

Should be uncontroversial.