1) Fixed bug introduced in commit 3cb16af5e323ada152cbac0a2a55cd4607bf6e7b
2) Harmonize bivariate plots in the proper way