Fixed others (27/33)

Fixed others