Fix annotations

Fixed annotations so project appears OK in Eclipse.