Fixup: Dont lock these members