Fixed up imports using Eclipse