Fixed others (17/33)

Fixed others