Fixed some issues with dumping annotations