1) Fixed bug introduced in commit 3cb16af5e323ada152cbac0a2a55cd4607bf6e7b
2) Harmonize bivariate plots in the proper way
(cherry picked from commit a2b3e0c147a978487ad659af5ec1660a41f3c72a)