Adding libs piecemeal to get around push timeouts