Fixed others (11/33)

Fixed others