Build fixes on Linux