Add aliases; add mac- and linux-specific items