Fixed formatting issues with some annotations