Fixed others (22/33)

Fixed others