Fixed others (31/33)

Fixed others