Adding fixes for missing or non-function callbacks
0.21.0