Fixed others (30/33)

Fixed others