Fix up various imports