Fixed others (7/33)

Fixed others