Fixes for building in Linux