Fix loader and curl issues