Fixed others (20/33)

Fixed others