REQ: some fixes on requirements not being imported correctly