Fixed others (24/33)

Fixed others