Fix for support lib submodule and remove ABS