Some mods in the core for SL/Win/WP