Fixed rebase errors and changed default keep-alive time