Small changes and converter fix