Fixed others (2/33)

Fixed others