fixed callback signatures, potential ctash