Reenable timeouts, fix various bugs