Fix for support library and dependencies.