fixes for managed package