rhbz1066756 - Correct QA flagged issues.