More fixes to converter and annotations