Tweaks to get it compiling for desktop again.
Sorry about that.