More Unity conversion

Converted more stuff so Unity is happy, please clean up after
yourselves.