Corrige issues #33, #49, #55