Async expired check, bugfixes