!347 fixed some of these, but not all. Signed-off-by: Joaquim Monteiro <joaquim.monteiro@protonmail.com>