Fix some more things and prepare conversion