Fix differents things