IDE-1002

Modified the bugs shown on the error log from QA test.