Provider resolution fixes