Small fixes

Switch to curl