Fixed others (26/33)

Fixed others