Fixes for Provider Controller and view