fixes for callbacks