Add mac support, fix break in switch