Fix some weird imports