Various code changes from Eclipse