Fixed others (16/33)

Fixed others