Added two annoying problems