Small async changes