Fixed options to take keepAlive and others into account