Fixed compilation issue and cleaned up imports.