Fixed others (13/33)

Fixed others