Debugging left over objc
Merge fixes