Fixes for mountain lion