fixes for lock_private and getting objc to build with order file