Fix for dead imports