Fixed others (10/33)

Fixed others