Minor fixes and curl timeout