Owner ID fixes.