Fix external imports