Some more mac fixes...