Small fixes for linux build