Fix eclipse warnings due to unclosed readers etc