Fixed some bugs with converter