Fixed module name
Dependencies update
Document TODO related to upstream bug