(UNIX) Build fixes