Fixes some annotations