Additional import path fixes