Fixed AndroidAnnotations issues