a few import fixes