Fixes for MAC