Fix annotations placement