Fixes from mac