Async skip and other small fixes