Initial work on getting this to compile for other targets.