Fixed others (6/33)

Fixed others