Fixes to match new React Style API