Once we start locking down symbol usage, these start breaking. So lets fix them so we can do do that.