Migrate to Maven Annotations + small fixes