fixes for custom derectives and push webhook handler