Fix OAddr loading