Fix eclipse nullness warnings