Fixed last dataframe joins + minor cleanup.

Carlos Cámararequested to merge
ccamara/valencia:patch-3 into master

Merge request reports