Various small fixes for basic promises how to