Fixups for running on my Mac