Fixed others (4/33)

Fixed others