Fixes for QA by Nilesh