Fix some conversion stuff