Fixed others (19/33)

Fixed others