Fixing some warnings that show up as compile errors on desktop