Additional Hacking violation corrections

Change-Id: I67c0845f22ae56b93251b7fb21ef491b3e676ed8