Fix differents things thanks to Hugo comments