Fixed others (29/33)

Fixed others