Fixes compile error due to stale imports