Updated for initial FireMonkey on Win and OSX support