Changes to get things working in VS (PCLs, etc)