Fix import issues (#7)