Fixing tf references