Fixes for linux build