More Mac compile fixes