Fix Provider listing and some bugs