Fix a few import path bugs