ownership fixes