Bug fixing and cleanup.

Interfaces no longer mutates itself during refresh cycle.