Fix import of common module