Fixed others (9/33)

Fixed others