Fix a couple of linux-specific leftovers