:hamburguer: Fixing some previous issues