Fix some eclipse warnings
Update manifest