Wall: fix import warnings