Fixing infinite-loading-plugin + fixes in plug infrastructure