Several fixed applied