Fixed others (8/33)

Fixed others