mac fixes from bassguitarman!