Fix issues around standalone annotations