Fixing some (but not all) Eclipse errors

Change-Id: I5a3f8744ed69e8e26de674d6c1d2832f9f921528
Signed-off-by: Ed Warnicke <eaw@cisco.com>