Fixed some apparentl complaints