Fixed others (3/33)

Fixed others