Fixing Mac + Linux compatibility (part 2 of 3) (MacSide)