Fixes #3324.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Fixes #3104.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Partial fix for #2284.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Fixes #3230.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>