Fixed others (14/33)

Fixed others