Server fixes, Converter fixes