Fix warnings introduced in 6673becb41c774b1063e4b18c1821ced049fee2e Eclipse was complaining about these. Change-Id: Id253d8ee93207b2a26e26ab4e5d7930cf62f2884