more annotation fixes