Removing async, other small fixes