Fixed 2 bugs with tips