Fix annotations