Fixed quality bugs