Fixed others (33/33)

Fixed others