vchethan | #2128 | Fixed issues found during dev box testing