Fixed others (28/33)

Fixed others