Some improvements

Thanks for the template! Worked great for the Promise adaptor.

In this PR I fixed some smaller things I noticed while creating the adaptor. The commits should be self-explanatory ;)