Fixing some other issues, we are ready to merge against win compile and cordobazombie0.1