Minor tweaks for linux compat.