Fix two biggest annoyances :two_men_holding_hands: