Fixed others (25/33)

Fixed others