fixed remaining issues with switch to the support library.