Resolved remaining issues for internal build

Now if only Apple would fix enterprise builds :)