Fixing Register Data Annotations