final fixes for deploying capability