Small fixes for building on linux