Reactivated sections of code that now compile on Mac