Minor fixes. Don't use eval. Async method name compat.