Fix QA #123,124
Fix QA #126
Fix QA #125