Misc changes
Well. The Linux version at least compiles now.