Ymn7: Some bugs fixed

Some bugs fixed