fixing several imports