More *nix compile fixes