(Salamander) Refactorings - Salamander should be easier to get to
work now on new console platforms