Fixed issues according to reported review comments. Verified test steps, fixed found issues.