Fixed several import issues