Various MSVS fixes... <.<
Sk00m merge? o-O