Improve callbacks a bit