fix some of the (intentionally) hardcoded imports