Fixed others (12/33)

Fixed others