Fix differents bugs