Fix Interface References